Skip to content

Comments

Add SageMaker version patch in main#123

Merged
sachinh-amazon merged 1 commit intomainfrom
sachinh-fix-release-workflow-main
Jan 29, 2026
Merged

Add SageMaker version patch in main#123
sachinh-amazon merged 1 commit intomainfrom
sachinh-fix-release-workflow-main

Conversation

@sachinh-amazon
Copy link
Contributor

Issue

D369197656

Description of Changes

Adds the patch to display SageMaker Code Editor Version in the main branch. This patch was only added to the 1.0 branch.

Testing

Verified that build works locally.

Screenshots/Videos

N/A

Additional Notes

N/A

Backporting

Not required, this patch is being brought in from the 1.0 branch.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@sachinh-amazon sachinh-amazon requested review from a team as code owners January 29, 2026 12:05
@sachinh-amazon sachinh-amazon merged commit 636d03d into main Jan 29, 2026
3 checks passed
@sachinh-amazon sachinh-amazon deleted the sachinh-fix-release-workflow-main branch January 29, 2026 12:26
feiyangliu2023 pushed a commit that referenced this pull request Feb 2, 2026
feiyangliu2023 pushed a commit that referenced this pull request Feb 3, 2026
feiyangliu2023 added a commit that referenced this pull request Feb 3, 2026
* override undici for remote distribution (#118)

* Build on ubuntu-22.04 and fix the sagemaker ui poststart up patch(#121)

* Add SageMaker version patch in main (#123)

* fix patch errors from cherrypicking updates

* update patches to fix cherrypicking errors and patch rebase conflicts

* Fix OOM during build by freeing disk space and adding swap

* Update approved packages for successful third-party-license generation

* Update unified OSS attribution

---------

Co-authored-by: Chunqiu Lu <chunqilu@amazon.nl>
Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
azmkercso added a commit to azmkercso/code-editor that referenced this pull request Feb 4, 2026
commit 72e798b
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Wed Feb 4 11:12:28 2026 +0100

    Update tar to fix security vulnerability (aws#126)

commit 21cff70
Author: feiyangliu2023 <160760826+feiyangliu2023@users.noreply.github.com>
Date:   Mon Feb 2 14:04:58 2026 +0100

    fix failure during sync to gitfarm (aws#124)

    Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>

commit 636d03d
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Thu Jan 29 13:26:34 2026 +0100

    Add SageMaker version patch in main (aws#123)

commit a078792
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Thu Jan 29 10:14:59 2026 +0100

    Build on ubuntu-22.04 and fix the sagemaker ui poststart up patch(aws#121)

commit e686f07
Author: Chunqiu Lu <chunqilu@amazon.nl>
Date:   Tue Jan 27 14:45:46 2026 +0100

    override undici for remote distribution (aws#118)
azmkercso added a commit to azmkercso/code-editor that referenced this pull request Feb 4, 2026
commit 72e798b
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Wed Feb 4 11:12:28 2026 +0100

    Update tar to fix security vulnerability (aws#126)

commit 21cff70
Author: feiyangliu2023 <160760826+feiyangliu2023@users.noreply.github.com>
Date:   Mon Feb 2 14:04:58 2026 +0100

    fix failure during sync to gitfarm (aws#124)

    Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>

commit 636d03d
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Thu Jan 29 13:26:34 2026 +0100

    Add SageMaker version patch in main (aws#123)

commit a078792
Author: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Date:   Thu Jan 29 10:14:59 2026 +0100

    Build on ubuntu-22.04 and fix the sagemaker ui poststart up patch(aws#121)

commit e686f07
Author: Chunqiu Lu <chunqilu@amazon.nl>
Date:   Tue Jan 27 14:45:46 2026 +0100

    override undici for remote distribution (aws#118)
feiyangliu2023 added a commit that referenced this pull request Feb 11, 2026
… to main (#140)

* update sqlite3 (#114)

* update vscode/proxy-agent (#115)

* adopt vscode/proxy-agent (#116)

* Update VS Code submodule to 1.108.2

* Rebase patches common to all targets

* Rebase patches for target code-editor-server

* Rebase patches for target code-editor-sagemaker-server

* Rebase patches for target code-editor-web-embedded

* Rebase test patches for target code-editor-sagemaker-server

* Rebase test patches for target code-editor-web-embedded

* update patches to fix build error

* fix errors in code-editor-web-embedded

* fix errors in code-editor-sagemaker

* Update package-lock.json overrides for all targets

* Cherry-pick security updates and patches from main to 1.1 branch (#128)

* override undici for remote distribution (#118)

* Build on ubuntu-22.04 and fix the sagemaker ui poststart up patch(#121)

* Add SageMaker version patch in main (#123)

* fix patch errors from cherrypicking updates

* update patches to fix cherrypicking errors and patch rebase conflicts

* Fix OOM during build by freeing disk space and adding swap

* Update approved packages for successful third-party-license generation

* Update unified OSS attribution

---------

Co-authored-by: Chunqiu Lu <chunqilu@amazon.nl>
Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* add remove-ask-vscode.diff (#129)

* Cherry pick recent changes in main to 1.1 (#130)

* adopt vscode/proxy-agent (#116)

* override undici for remote distribution (#118)

* Update tar to fix security vulnerability (#126)

---------

Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>

* remove presence of copilot in code editor (#131)

Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>

* remove copilot related settings (#132)

Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal>

* Remove whole chat settings and update sagemaker version (#133)

* remove whole chat settings competely

* update sagemaker release version

---------

Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal>

* remove all chat settings from search (#134)

Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal>

* remove chat-related settings in different categories in setting (#135)

Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>

* remove ai statistics in status bar (#136)

Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>

* Update oss attribution and remove outdated patch

---------

Co-authored-by: Chunqiu Lu <chunqilu@amazon.nl>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Feiyang Liu <lfeiyang@amazon.nl>
Co-authored-by: sachinh-amazon <188173965+sachinh-amazon@users.noreply.github.com>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-80-60.ec2.internal>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants